Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

immich-cli: 0.41.0 -> 2.0.6 #279832

Merged
merged 1 commit into from
Jan 12, 2024
Merged

immich-cli: 0.41.0 -> 2.0.6 #279832

merged 1 commit into from
Jan 12, 2024

Conversation

pineapplehunter
Copy link
Contributor

@pineapplehunter pineapplehunter commented Jan 9, 2024 •
edited
Loading

Description of changes

Updates immich-cli to version 2.0.6
The immich cli version is different from immich repo, so version is imported from package.json.

closes #274787

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@cole-h
Copy link
Member

cole-h commented Jan 9, 2024

@ofborg eval

dotlambda
dotlambda requested changes Jan 9, 2024
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ask upstream to separately tag CLI releases if they don't share a version number.

pkgs/tools/misc/immich-cli/default.nix Outdated Show resolved Hide resolved
pkgs/tools/misc/immich-cli/default.nix Outdated
buildNpmPackage rec {
pname = "immich-cli";
version = "0.41.0";
# version of immich and immich cli differes
version = (builtins.fromJSON (builtins.readFile "${src}/cli/package.json")).version;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an import from derivation which is not allowed in nixpkgs.

pkgs/tools/misc/immich-cli/default.nix Outdated

meta = {
changelog = "https://github.com/immich-app/CLI/releases/tag/${src.rev}";
changelog = "https://github.com/immich-app/immich/releases/tag/v${immich_version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
changelog = "https://github.com/immich-app/immich/releases/tag/v${immich_version}";
changelog = "https://github.com/immich-app/immich/releases/tag/${src.rev}";

pkgs/tools/misc/immich-cli/default.nix Outdated

immich_version = "1.92.1";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
immich_version = "1.92.1";

pkgs/tools/misc/immich-cli/default.nix Outdated
rev = "v${version}";
hash = "sha256-BpJNssNTJZASH5VTgTNJ0ILj0XucWvyn3Y7hQdfCEGQ=";
repo = "immich";
rev = "v${immich_version}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rev = "v${immich_version}";
rev = "v1.92.1";

@pineapplehunter
Copy link
Contributor Author

Thanks for the review! Updated the code.

Please ask upstream to separately tag CLI releases if they don't share a version number.

I was not falimiar with the import from derivation case. (I kind of asumed that if it compiles, it is okay.)
Iwill see if I could ask for the cli version numbers, but for now, is it best to just hard code the version numbers?

@ofborg ofborg bot requested a review from felschr January 10, 2024 02:38
@dotlambda
Copy link
Member

for now, is it best to just hard code the version numbers?

Yes, but revshould point to the actual commit at which the version was published on NPM rather than the most recent immich version.

dotlambda
dotlambda reviewed Jan 10, 2024
View reviewed changes
pkgs/tools/misc/immich-cli/default.nix
@@ -2,26 +2,30 @@
, buildNpmPackage
, fetchFromGitHub
}:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove this line?

pkgs/tools/misc/immich-cli/default.nix Outdated

meta = {
changelog = "https://github.com/immich-app/CLI/releases/tag/${src.rev}";
changelog = "https://github.com/immich-app/immich/releases/tag/v1.92.1";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't list the CLI changes.

@pineapplehunter
Copy link
Contributor Author

@dotlambda Thanks again for the review!
I got the exact commit that is used when it was uploaded to npm, so this should be the same as using the version on npm.

@dotlambda dotlambda merged commit 9d4636d into NixOS:master Jan 12, 2024
23 checks passed
@pineapplehunter pineapplehunter deleted the immich branch March 6, 2024 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda dotlambda approved these changes

@felschr felschr Awaiting requested review from felschr

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer 12.approvals: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update request: immich-cli 0.41.0 → 2.0.4
4 participants
@pineapplehunter @cole-h @dotlambda @delroth